Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Tue, 16 Apr 2013 14:10:51 +0000 (17:10 +0300)
committerEli Zaretskii <eliz@gnu.org>
Tue, 16 Apr 2013 14:10:51 +0000 (17:10 +0300)
commit72a1c07d544b047f2e865ee648522fe42c57def2
treed490b02062b1a7ef92adbe13464d33f6295e6da6
parent4ea4f2a7e9d3bc48dec734308a49cdef881305bc
parent3e440d19d12bc740010d9e98958d529260eea321
Merge from trunk.